fixed a return None,None bug