VIX-197 - Pull Request #2

Reopen of previous pull request with bug fix for recent issue included.