Fixing stupid UX bug