Fix NC and PF bug