Issue #299 fixed