Better handling of special cases