Fixed handling glitch