WINDUP-222: Fix bug
Merge pull request #260 from mbriskar/WINDUP-222d

WINDUP-222: Fix bug