Please see http://bugzilla.gnome.org/show_bug.cgi?id=92233
Garrett do you want to change anything here?
Looks ok in current version.