Possible fix for issue #429