Form bugfix 15