PB Issue8 see TODO1