Fix for crash that Philip was seeing.