This fixes an issue where if a short context was supplied to the call it
would still take a long time to complete.