Fix #832

I think this should work.

To Do:
- [x] Fix selendroid