Poposed fix for issue #450