Fixed issue #448