fixed issues with space in name