Fixed 'singleton' implementation