Prep fix for #385