Fixed issue with triggers not being registered thanks to Oren