final change for #1155