Fixing issue 72