Not quite working yet

Hopefully this change fixes it