fix for Orchard 1.8