Fixed the dumb parameterization issue mentioned in the last commit