Fixed input handling