Fixes bug 1267526, API fixed