code fix for beta 7