Static data fix