Fix expand_path call