Better Polyread handling