Maybe we can handle it without gemset?