Minor improve in forms