re:2.2.4

Retake on the last commit. Mistakes were made.