Fixing regression caused by e1409cdd046dfc14da2683