Fixed bug introduced when changing ProuctDataBean into a singleton