Fix regression caused; address @commuterjoy's feedback