hacky fixes for private puffs