Adonis: fix endless loop/