Accumulated bug fix