Fix for people who cannot handle spaces