Pulled fix from Trond