Update to comment from @slfritchie