Attempted to alleviate #5 (base path suffix problem)