fix for issue #528