Issue #527 fixed