Fix so that triggers work