work around a bug in the SDK
add comments to code