Hopefully fixed Phu's breaking of the Manifest