Merge default
Fixed a typo

Everything seems to work fine still, but it looked like a typo.