fix for #212/1