Tried to do clean-up, found a bug.