improved non-path handling
0.4.8