Proper trigger replacement now works =)