Fix for #126
Merge pull request #128 from dasrecht/feature/wpsvbtle-126

Fix for #126