fix 3 and 5 from corrects from 25.02.2014