Implements suggested preliminary solution for #2399