First attempt at a fix for mdo/wtf-forms#12