Fixed trigger bug