Andre "Fixed duplicate check"