chore #67378552, looked at special cases