I know this change fixes something, but I can't remember what exactly.