Merge pull request #560 from phihag/fix-to_screen-mode