resovle 1.4 and 1.6