Should fix encoder issue?