Fix for issue #553