Use more aggressive approach that should work...

Fixes 1.8 I hope