Last minute fix: Mode removal is fixed!