Work around for crash