version  3.6.1.1 with minor fix