Fix for loading context on init