bug fix and short scenario