Fixing for beta 7