Not corrupted fixes