Update Issue 277

Fixing bad merge