CFY-1363 fix for no-op