more issue fixing