Temporary fix for crash