tried to resolved issue # 50