Yeah, that was breaking things.

Heres a proper fix