Make sure contexts are completed in all cases