PFS-658 #comment more