Fixing issue where pushing screen was falsely reported