Issue #26 merge issue with product click