Main Branch: Pen of the Void bugfix