Add fix to form init