WIP
Bugfix - ensure correct continuation