Bugfix for early PN integration