Temporary fix for encoder failures