Shaping implementation fix.