rc 22, fix #22