Form bugfix 2