fixed crash

Conflicts: