bug fix, more examples