Fixes Forms, to make sure type property exists before reading it