fix for issue #556