fix 1.8 before getting ahead of ourselves with 2.0.0 ;)