Fix #12 (API changed?)