Fixed PB compatibility patch