Fix: bug in activation controller