Fixed issue #472