fixed issue with overriding core components