Fixes PR13450, thanks Matthew