second half of previous fix