Fixed Triggers

Thx Dima