Fix/anubis

see #26