Fixing issue 86