Fixed returning of always true