quick fix for core