Another future fix