Fix for issue #560