pre encode prep now works as it should