Fix for beta3