Restore compatibility with FP 10.1