Fix Some Problem