- Fixed potential crash