Updated per Juj's comment in github pull request #2442