Sigh. More corner cases to deal with!