One more attempt to #1250