Did the rewrite fix this?