[Jason, Evgeny] bug fix on trigger