Fixed file name resolve
v1.8