Fixing gem stuff