Fixed #85- https://github.com/ocpsoft/rewrite/issues/85