Deal with odd cases