fix for beta 7