Clean-up fix