sort of fixes #68, although you should always have an assessment, need to fix upstream a bit