Fixed issue 463