try some fixes