Fix for the PR of @ttaylor