Minor mod to previous commit