Possibly fix #451, cursed code