fix product handler