prepare 1.6 + little fix