Fixed issue with the new contexts option