fix two bug