(v1.1.5) Bug fix for Craft 2.0 upgrade