Form bugfix 13