Merge bug fix by Trond.