Add proper resolve
0.1.1