Fixing issue 78