Fix for drag&drop and commander minion behaviour