Fix for BPS-553