fixed two bug