API bits for #134 fix

As per title