Fixed BAP-2245