Thune, fixes #141