Fixing logic to call valid? method