Fix for issue #480