bug fixing api 3