Trying to implement the Jensen patch.