Fully fixed from crash