Fix commit 5ad0895c46cda889c5640eec311a45aded9303c4