Crash on edit screen fixed