Submitted changes by Mads Kiilerich.