worked in @MatthewMueller 's comments on PR #264