bug fix
merged with the js sdk