Fix agitation not being fired correctly