Fix FRA map bug. Attempt number 2.