Fixed issue #476