Fix for primary screen