Another small fix for GH-174