apply changes, try to resovle crash