FIX: Ensure form works all the time using entwine