Issue #487 fixed