Fix for missing rate of change and value index in Flap