bug fixed with custom forms