Other part of the previous fix.