don't drop custom block definitions when changing the language (fix #557)