Fixes #367 issue.

Fixes #367 issue.