surgery fixup

fixes of my last commit
Merge pull request #274 from Bram961/master

surgery fixup