Fixed issue #528