Fix/#34 pathresolvers

See explanation in commits.

Review by @DarkDimius, @srjd