Fix immediate crash