Fix the frustrating bug