Fixed Fatal Errors