update from rubenwardy to fix soup problem