Fixed issue 244