more fixes
Merge pull request #796 from Alicirno/patch-3

more fixes