Form bugfix 16