bugfix - mo' mutability mo' problems