Fixed flat view issue