Temporary Fix view 1