mamba-fix reverted