Bug fix: fatal error fix.