fix gemsets, fix #2466