Revised 4.3.3 based on fpeer-feedback.