Additional fix to last rewrite