fixing diff issues