BUG FIX (DELETE + ADD)