fix for issue #568