fixed issue with previous commit

This deals with the aggressive refactoring I did in the
previous commit. Ah well. IPA is delicious don't you think?