patch for 1.6, remove avaible on 1.5