Fixing disabled function checks

fixes #6656