Fix commit 7b9e9d76f895adcd9cc5c1d1598ae36d95e75907