Fix for failed propick merge.