So many fixes >.<