Fix compile error due to earlier improvement