Fix removal issue... attempt #3