Create product fixes

Maybe, we should remove it?