Just have to sort out @thumbs
Done. Fixes #336