Random hacks

Not really valid to the PR itself, but isn't this condition always true?