Added option to use the same trick as in previous commit for inputs