Fixed dev rewrite