Form bugfix