Fixed handling of Completion