Fixed input bug (again... reverted back to re-merge)