Refact. Fix https://github.com/studio107/Mindy_Form/issues/8