fixes #690 and failing test in 4f6e4b9
fixes #690 and failing test in 4f6e4b9

Davidzhu001/formtastic,ryanfox1985/formtastic,thenthen8515/formtastic,justinfrench/formtastic,EndingChaung/formtastic,Guestfolio/formtastic,justinfrench/formtastic,Guestfolio/formtastic,nishaya/formtastic,sideci-sample/sideci-sample-formtastic,ConferenceCloud/formtastic,justinfrench/formtastic,ConferenceCloud/formtastic,Davidzhu001/formtastic,ryanfox1985/formtastic,thenthen8515/formtastic,ryanfox1985/formtastic,mikz/formtastic,Baltazore/formtastic,paulodiovani/formtastic,EndingChaung/formtastic,mikz/formtastic,paulodiovani/formtastic,nishaya/formtastic