Fix bug with additional space