Partial prefix bug fix