fixed some form issue