fix for beta (DEV BRANCH)

fixes #26