Bug fixing on G shortcut