Issue #246 pull-request