1518 changes #32