Handle case a little nicer