final fixing after merge