some fixes union