Changed BuildVariableProductFormListener logic