Fix for beta 5