Fixes undefined paths and values
0.1.2