FIXED: Issues with trailing slash on basepath