Little fix to push variables in front of products and sums