seems to be finally fixed