Handle is_complete indicators correctly (fix #3)