Clean-up broke something, doh