See comment on the issue below