FIXED: 11.2 compatibility