Adjustment to remove an awkward cast