Fixed BPC bug (again)