fix issue #180
Merge pull request #264 from RunningDroid/next

a fix for issue #180