resolving change trigger issues