removed bugs introduced with beta 5