Fixed issue #737

Fixed issue #737. Moved the `onCompleted` logic under the condition `latest == id`.