Fix rank removal