add workaround for a bug