[Fix] Fixed regression introduced by commit 3898342