Big Weasel - fixes #47