emergency fixes