Fixed a bug in the beta version