Error on ecommerce using one page checkout

[[EMAIL PROTECTED]]

Hi to all,

I have tried now with last revision of trunk the ecommerce one page  
checkout and it gives to me the following error:

org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen  
[component://ecommerce/widget/OrderScreens.xml#OnePageCheckout]:  
groovy.lang.MissingPropertyException: No such property:  
shipToContactMechId for class: EditBillingAddress (No such property:  
shipToContactMechId for class: EditBillingAddress)

it is probably due to the following lines into EditBillingAddress.groovy

    if (shipToContactMechId) {
        if (billToContactMechId &&  
billToContactMechId.equals(shipToContactMechId)) {
            context.put("useShippingAddressForBilling", "Y");
        }
    }

I'm not sure but probably it can be fixed using the following lines.

    if (context.shipToContactMechId) {
        if (billToContactMechId &&  
billToContactMechId.equals(context.shipToContactMechId)) {
            context.put("useShippingAddressForBilling", "Y");
        }
    }

Thanks
Marco