Fix: [ bug #1505, #1504] Project trigger problem