Fixed crashed in #214 #215