Fixed as promised