Take care of special cases