4.6 & small fix