Merge pull request #335 from denisrosset/topic/fix-PR-323

Fixed #323 partially completed merge.
Merge commit 'd1c0e74a2bfe493ede09200a6ee8a8dee58cb0ac'