Fixed Some Bug.