Fixes the form issue halfway