Version 3.0 beta fix bug