Initial data fix