Fix handling of contexts