Checkpoints not working (#190)

checkpoints weren't working when again was triggered the same turn

Fixes #190.
Merge branch 'dev'