resolve last bugs