Issue #913 fixed