[trunk] Fix for issue #61

This pull request fixes issue #61