fix #455 #456
fix #455 #456

jdk137/vizabi,vizabi/vizabi,buchslava/vizabi,sergey-filipenko/vizabi,alliance-timur/vizabi,Gapminder/vizabi,sergey-filipenko/vizabi,alliance-timur/vizabi,Gapminder/vizabi,Gapminder/vizabi,sergey-filipenko/vizabi,buchslava/vizabi,vizabi/vizabi,alliance-timur/vizabi,dab2000/vizabi,buchslava/vizabi,jdk137/vizabi,dab2000/vizabi,jdk137/vizabi,dab2000/vizabi