Resolves https://github.com/WebSharks/s2Member/issues/118