Fixed; see if you can remove the workaround.