Modified to support Gnome 3.10