i125349 refined to exclude possible recursive calls