Fix for inputs