First working 1.6.4 version