Form bugfix 12