Fixing Trigger and Dispose methods