I have just spoken to a friend of mine because he had the same problem with his 2015 model ( Now Sold due tri ill health ) he eventually had the pump replaced because under certain circumstances the fuel evaporated when the engine was hot and had been turned off. Causing a lack of fuel to the engine. He told me that it did cure the problem,,,,,,,