Fixed some issue