Fixed double view issue