fix for issue #254