Fixed Override issues