Fix for BD-51 (AS does not work for field sets)