Fixes context save call