Fix for issue #448