Make it compile for both Henrik and Thomas.
Code from Morten Laursen.