Issue #169 for abdo