Product Unit Bug fixed