Finally fix the workaround