support latest beta, correctly