Bugfix dummy removal