Amendment as per https://github.com/x-team/remember/pull/44#discussion-diff-16751327