fixing more gems