Fix for issue #431