Fix for environments with witespace in home-path