Form bugfix 9