bug on clean-up