Add temporary workaround for bug