Hot fix for triggers