lukego Merge pull request #246 from lukego/fix-unsinking