tried to fix the image selection but didn't quite succeed, still seeing regular crashes