fixed both forms