Hot fix changes