Improved and fixed trigger method