Public API change + bug fix