more abuse logic (Thanks Olegario)