Fix it properly ;)