WP-4621 Changed file path to use fpid