Another version of #23 (f)