Modify workaround