Fixing issue #169