Fix issue described in footnote 3