Hack in fix for crash