M6: fixing problems