Fixed double-trigger bug