fixed crashes after latest push