Form bugfix 3