Fix clean-up problem