Fixes #360 issue.

Fixes #360 issue.