BugFix for #260
Merge pull request #261 from FireBall1725/rv2

BugFix for #260