WIP: fixing relative back paths issues