Fix logic of rewrite mode computation for cases raised in #326

Fix logic of rewrite mode computation for cases raised in #326 #291