Fix for last commit not working on 1.8. Vintage.