Fix issue #9, API broken in old customers of the library