Finally beating that damn legacy mutator...