fix singletons

[srukelman]

singleton implementation has a bug that mades it do the exact opposite of what it was meant to do and a new class instance is created every time instead of always returning singular instance