Fixed improper handling of spaces