Form bugfix 8