ohhh, I see. Maybe file a bug saying that we need to fix the edit form later on to do the conversion properly. Your fix seems fine for now.