Fixing BPS-504