fixed partial form logic