fix bug for forms