Fix bug with workaround