Changed for Ethna 2.6-beta4