-Fix that ugly code of me.