Further fixing after merge with master form base.