Incorporate modified version of Roland Rosenfeld's patch to