Fixing the triggers