Additional fix wrt #572