Fix for the G+ version as well