Fix Single table inheritence