major resolve bug fix