Odd that this wasn't caught before being merged the first time :)