Fixed handling of completion within functors