Fixed issue with paths and ending separator