make it work with beta 6 (fix #1)