Fix issue #3
Merge FixIssue3