Fixed crashes in #214 #215