Fixed issue with new context