Fixed issue #451