AWDEncoder: Fix for user-vars