workaround suggested by google