fix for mapping and forms