Cheesy hack for mutable vector issue