tried to resolved issue # 36