Fixes regression
Clean up