Fixed issue with permanent/one time operations