Fix bug with single cases