revert to v1.5.10 until #2 resolved