Fixing bug in clear-screen remapping