Fixed bug where path's were really suboptimal