Add temporary workaround