Workaround for google bug