fixes #1 fixes #5 (real fix by k2 original SVN)