workaround for bugs