Re-Add FMP Support

Fixed the bug issue thanks to GregoriusT