Commented out some code for the fatal error issue.