Fixed overriding problems.