Patched a remaining issue with break statements in determining completion value