Fixed input bug