part of 79018c60f95e2db695b36c8c699ac0a48e7d073c
fix regression