Fix PEP broadcasting issue (EJAB-1680)