HotFix for Crates