Fix controller (preventing creation after removal)