-- Fix for test failure