Fixed issue127