This is not going to be trivial to fix