Simple fix for issue #629