Fix #864.
Fix failing tests.
Fix failing test and green dot.
Merge pull request #885 from timlinux/master

Hotfix - akbar's fix for #864