Updated to revision 1078