bug fixes for revoke