fix for beta7