fix relative path loading
Merge commit '92acd146f638f2d063682f94dcc3dadaa2ac834f'