Fixes commit 4bf099e5e8209e54cfd5a51f4cab5ab439fd8419