Fixed issue #473