Commong bug fix