Fixed issue #454