Fixes #340 - re-applied the patch given by Sydney-o9 for the new FOS bundle