Fixed bug with singletons on Mixin