should be OK for beta-release