#2 API fixed