Merge pull request #885 from timlinux/master

Hotfix - akbar's fix for #864