Return True instead of None