Issue #318 fixed