Bugs PNJ Issue #34