Applied Issue #1 fix to create deliverable page too.