Fixed issue 406