Fix variable declaration
Fix empty path issue