Fix file extension stripping
Do we still work on 1.8.7?