Fixed for resubmission