FIX: Compatibility with YAG Version 3.2.x