OWTF 0.40 'Summer Storm III': Better fix for #115