fixing ticket Fix-141
fixing fix-141