Bugfix trigger