bugfixes for revi