Fixed trigger errors