fixed issue with 1.4 merging into 1.8