Lazyfix papercode a bit. should complete #1398