Added overriding check.