Should Patch Issue #177