Fix to avoid Fatal error