fixed crashes again