Fixing issue #161.