Amendment as per https://github.com/x-team/remember/pull/49#discussion-diff-16878014 and so on