fixed a silly mistake while manual merge done in c2e167e
Merge branch 'fatal-error-fix' into dev; fatal error fix