Updated as per comment on GH