Fix crashes. Prod version 1.3