#7,#6 - fixed