Update to fix premature exit!