Extra changes to solve functional conflict between 887174 and 887179
Trivial but lethal mistake