temp workaround for connection count issue
add FIXME comment.
fix test