Fix #TEST-2