First changes for #976