Single instance independent from parameters number hotfix