Fixes regression in the cleanup