PBO quick fix