fix for issue #544