bugfix beta 1