dellis: fixing expand_path issue