Adjust in response to jan.h.d's comments.