Added some FPC 2.4 fallback code