Fix for #975.
Merge remote-tracking branch 'origin/develop' into fix_975
Merge pull request #976 from ismailsunni/fix_975

Fix 975