api fix
merged