Fix for AE-274