smal repairs
Merge branch 'small_repair'