still trying to fix broken rewrites