Fixed bugg, changed from || to &&