Follow-up of previous commit. #564