Modified trigger fixed