fix FV and tested