Fix class to allow more than one instance