One more fix is needed for master branch