some issue fixing