preparation for tag 1.6