Fixed bug with creating new context groups