Adapted: sponsor code according to #937