ah, we discussed this on IRC a little bit, it is ok to leave this logic where it is