final fix for g+