Temporary patch for unit test to pass