Fixed BPS Bug