Fixed rewrite rules