Issue #171 for abdo