Fixed issue 223