Fixed issue232