Partial fix for Transmute breakage