Fixes commit 99204b75da5d59607683886989ece047e164f0ff