solve #278 + latest 3.x support