Fix trailing space bug!