Fix it properly

Move along, nothing to see here.

Well alright then, see #469 if you would like to know more…