fix confusion between forms