Fix for non-disappearing minions
Merge branch 'pim'