fix for issue #576