Workaround for starred issue