Complemented for #f1b3bea commit