Fix Input Handling