fixed crash, added border