FD4.7 compatibility