Handle spaces gracefully