Additional fix for issue #430