fixed null G handler