Fix spaces
Fix wrong restoring when stored on screen 0