fixed Beta bugs