some fixes are required