Fixing wrong merge for #237