Left out the changes from the previous commit:
19a3cb9a145f774310c0ad7b9365c10aeca42c98