Fixing BPS-497