fix for beta 5