Alright then, fix it properly