Issue #1146 fixed