Adding fix to complete screen