Fixed some code, as you do