beta version fixed