Prefix bug fixed