Final fix for beta