Made recent changes work with older versions of param