Fix for @mikemcquaid suggestion