fixed possible issues with spaces