OWTF 0.40 'Summer Storm III': Fixed #123 in previous commit