Guard WIP refs #30 fixes #22