fixed bug: if no basePath - will work correct now