Form bugfix 6