Fixed issue 459