Merge Dennis' patch (why do I have to merge?)