Fix for a bug #21174

Whoops, i want to pull only my last commit: 7d5cd9d