v 1.6 fix