Fix previous 6c36eb4 commit