Fix for Draper < 1.0