Add workaroudn for inheritance problem