Fix commit 455d503d33d3ea49af8d2c721196cb3ccc2ba243