diamond fixes