Fixed problem reported in the issue #51