Fix for issue #440