issue #26 : rewrite