Fix commit 43152ca773927cc48cdbffb893fdf1d7456a25d9