Beta version fixed