HotFix for Encoder