Fixed 1 crash