fixed trigger implimentation