Modified as per discussion in #264