This is the change for #1155