Fixed input issues!