Fixed issue with retruning trailing slash