check out my release 2.1.8-RC5