enhanced FPC 2.6.4 compatibility