Fixes

Window dropping fix