temporary fix for the core