Fixed some mess