Missed committing part of previous fix.