Fix commit 935b69e065