One more logical issue fix