update to 1.6 & fix bug